From 306d28b4f52677214ddf8a67d2cf233317049718 Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Mon, 11 Oct 2004 14:52:43 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.219 (416a9e3bO5_6f1e0AMMNVRk0kCNWpQ) Bug fix, from code inspection. MMUEXT_TRANSFER_PAGE error case would have inappropriately caused an ASSERT, due to a "break" statement getting caught by a while loop, rather than the intended switch statement. --- BitKeeper/etc/logging_ok | 1 + xen/arch/x86/memory.c | 1 + 2 files changed, 2 insertions(+) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 125ee3ffd9..529c88199e 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -30,6 +30,7 @@ kaf24@scramble.cl.cam.ac.uk kaf24@striker.cl.cam.ac.uk laudney@eclipse.(none) lynx@idefix.cl.cam.ac.uk +mafetter@fleming.research maw48@labyrinth.cl.cam.ac.uk mjw@wray-m-3.hpl.hp.com mwilli2@equilibrium.research diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index ad6059e185..c9e617e242 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -1156,6 +1156,7 @@ static int do_extended_command(unsigned long ptr, unsigned long val) : "0" (d), "1" (x), "c" (NULL), "b" (x) ); } while ( unlikely(nd != d) || unlikely(y != x) ); + if (!okay) break; /* * Unlink from 'd'. At least one reference remains (now anonymous), so -- 2.30.2